From: Carl Lerche <me@carllerche.com>
Date: Mon, 17 Mar 2014 19:03:37 +0000 (-0700)
Subject: Fix warnings
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~1135
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=acb4cbbc259951d8297856724745cb95431c16d7;p=cargo.git

Fix warnings
---

diff --git a/src/bin/cargo-read-manifest.rs b/src/bin/cargo-read-manifest.rs
index c4f12cdae..19bb39087 100644
--- a/src/bin/cargo-read-manifest.rs
+++ b/src/bin/cargo-read-manifest.rs
@@ -4,13 +4,11 @@ extern crate cargo;
 extern crate hammer;
 extern crate serialize;
 extern crate toml;
-extern crate semver;
 
 use hammer::{FlagDecoder,FlagConfig,FlagConfiguration};
 use serialize::{Decoder,Decodable};
 use serialize::json::Encoder;
 use toml::from_toml;
-use semver::Version;
 use cargo::{Manifest,LibTarget,ExecTarget,Project};
 use std::path::Path;
 
@@ -78,7 +76,7 @@ fn normalize(lib: &Option<~[SerializedLibTarget]>, bin: &Option<~[SerializedExec
     }
 
     let b = bin.get_ref().map(|b_ref| {
-      let mut b = b_ref.clone();
+      let b = b_ref.clone();
       let mut path = b.path.clone();
       if path.is_none() {
         path = Some(format!("src/bin/{}.rs", b.name.clone()));
@@ -97,7 +95,7 @@ fn normalize(lib: &Option<~[SerializedLibTarget]>, bin: &Option<~[SerializedExec
     (~[LibTarget{ path: path.unwrap(), name: l.name }], ~[])
   } else if bin.is_some() {
     let b = bin.get_ref().map(|b_ref| {
-      let mut b = b_ref.clone();
+      let b = b_ref.clone();
       let mut path = b.path.clone();
       if path.is_none() {
         path = Some(format!("src/bin/{}.rs", b.name.clone()));
diff --git a/src/bin/cargo-rustc.rs b/src/bin/cargo-rustc.rs
index 5b48a9859..d006ba966 100644
--- a/src/bin/cargo-rustc.rs
+++ b/src/bin/cargo-rustc.rs
@@ -8,9 +8,9 @@ use std::os::args;
 use std::io;
 use std::io::process::Process;
 use serialize::json;
-use serialize::{Decoder,Decodable};
+use serialize::Decodable;
 use std::path::Path;
-use cargo::{Manifest,LibTarget,ExecTarget,Project};
+use cargo::Manifest;
 
 /**
   cargo-rustc -- ...args
@@ -47,7 +47,10 @@ fn main() {
     ~"--crate-type", ~"lib"
   ];
 
-  io::fs::mkdir_recursive(&root.join("target"), io::UserRWX);
+  match io::fs::mkdir_recursive(&root.join("target"), io::UserRWX) {
+    Err(_) => fail!("Couldn't mkdir -p"),
+    Ok(val) => val
+  }
 
   println!("Executing {}", args);
 
diff --git a/src/bin/cargo-verify-project.rs b/src/bin/cargo-verify-project.rs
index afc6d00ee..85b8a5e24 100644
--- a/src/bin/cargo-verify-project.rs
+++ b/src/bin/cargo-verify-project.rs
@@ -4,8 +4,7 @@ extern crate toml;
 extern crate getopts;
 
 use std::os::{args,set_exit_status};
-use std::io::process::Process;
-use getopts::{reqopt,getopts,OptGroup};
+use getopts::{reqopt,getopts};
 
 /**
   cargo-verify-project --manifest=LOCATION
@@ -20,7 +19,7 @@ fn main() {
 
   let matches = match getopts(arguments.tail(), opts) {
     Ok(m) => m,
-    Err(err) => {
+    Err(_) => {
       fail("missing-argument", "manifest");
       return;
     }
@@ -39,8 +38,8 @@ fn main() {
     return;
   }
 
-  let root = match toml::parse_from_file(file.as_str().unwrap()) {
-    Err(e) => {
+  match toml::parse_from_file(file.as_str().unwrap()) {
+    Err(_) => {
       fail("invalid", "invalid-format");
       return;
     },